Labor attendance report 1626 by Arohasina · Pull Request #1684 · BCStudentSoftwareDevTeam/celts

Arohasina · 2026-02-25T22:53:02Z

Issue Description

Fixes #1626

We should have a sheet in the Reports downloads that shows labor attendance for the academic year. The report should have a list of labor students and the number of labor meetings that they attended for each term in the academic year.

Changes

Implemented laborAttendanceByTerm(term) function to query labor students and count their meeting attendance by term
Added "Labor Attendance By Term". There are two sheets: one for Fall term and one for Spring term (for the academic year)
added the test function test_laborAttendanceByTerm in test_spreadsheet.py

This is how the spreadsheet looks like:

Testing

run database/reset_database.sh test and then tests/run_tests.sh or if you want to test the laborAttendanceByTerm function specifically, you can run pytest tests/code/test_spreadsheet.py::test_laborAttendanceByTerm -v
after it passed, run database/reset_database.sh from-backup and then flask run
Once you are in the Celts app, go to event list choose Fall 2024, and then choose a couple of events there, such as these events

And for each, click on the event, turn on the toggle "This event is for labor only" , and then click "save"

And then do the same for Spring 2025.
Then go to admin --> report --> select academic year 2024 - 2025 --> download the spreadsheet, open it, and you should see a sheet called "Labor Attendance By Term" with the reporting, one for Fall and one for Spring term.

Copilot

Pull request overview

This pull request implements a labor attendance report feature that tracks labor student participation in labor-only meetings across terms within an academic year. The implementation adds a new sheet to the downloadable reports spreadsheet showing each labor student's meeting attendance count per term.

Changes:

Added laborAttendanceByTerm() function to query and aggregate labor meeting attendance by student and term
Integrated the new "Labor Attendance By Term" sheet into the spreadsheet generation workflow
Added comprehensive integration test coverage for the new functionality

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 4 comments.

File	Description
app/logic/volunteerSpreadsheet.py	Implements laborAttendanceByTerm function (lines 228-249) to query labor students and count their meeting attendance, and integrates it into createSpreadsheet (line 298)
tests/code/test_spreadsheet.py	Adds test_laborAttendanceByTerm integration test (lines 686-724) covering empty results and attendance counting scenarios

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

app/logic/volunteerSpreadsheet.py

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot

Pull request overview

Copilot reviewed 2 out of 2 changed files in this pull request and generated 3 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

app/logic/volunteerSpreadsheet.py

tests/code/test_spreadsheet.py

…Team/celts into Labor_Attendance_report_1626

…ftwareDevTeam/celts into Labor_Attendance_report_1626

Copilot

Pull request overview

Copilot reviewed 2 out of 2 changed files in this pull request and generated 5 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

tests/code/test_spreadsheet.py

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot

Pull request overview

Copilot reviewed 2 out of 2 changed files in this pull request and generated no new comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

tests/code/test_spreadsheet.py

…tendees

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot

Pull request overview

Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

tests/code/test_spreadsheet.py

app/logic/volunteerSpreadsheet.py

ojmakinde

Looks good

Copilot

Pull request overview

Copilot reviewed 2 out of 2 changed files in this pull request and generated 3 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

app/logic/volunteerSpreadsheet.py

Copilot

Pull request overview

Copilot reviewed 2 out of 2 changed files in this pull request and generated 3 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

app/logic/volunteerSpreadsheet.py

tests/code/test_spreadsheet.py

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot

Pull request overview

Copilot reviewed 2 out of 2 changed files in this pull request and generated no new comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Arohasina · 2026-03-31T22:32:53Z

I noticed the spring report didn't include zero attendance (for labor students). Brian suggested a roster membership rule for labor attendance reports. Include a student in the labor roster if either:

the spreadsheet term exactly matches their CeltsLabor term, OR
their CeltsLabor row is an academic-year assignment and belongs to the same academic year as the spreadsheet term.

Academic-year labor rows are stored once (typically on Fall), but we generate both Fall and Spring
sheets. Without this rule, Spring can miss labor students who attended 0 labor events, so those students do not appear with a zero count. So I added that fix.

Copilot

Pull request overview

Copilot reviewed 2 out of 2 changed files in this pull request and generated 3 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

app/logic/volunteerSpreadsheet.py

github-actions · 2026-03-31T22:48:57Z

View Code Coverage

MImran2002

this is still under review. I am revisiting the peewee again during lunch.

Arohasina added 3 commits February 25, 2026 16:05

added the function laborAttendanceByTerm

5905549

added test function test_laborAttendanceByTerm

97fe183

added laborAttendanceByTerm to the spreadsheet

4c89d93

Copilot AI review requested due to automatic review settings February 25, 2026 22:53

Copilot started reviewing on behalf of Arohasina February 25, 2026 22:53 View session

Copilot AI reviewed Feb 25, 2026

View reviewed changes

app/logic/volunteerSpreadsheet.py Outdated Show resolved Hide resolved

app/logic/volunteerSpreadsheet.py Outdated Show resolved Hide resolved

app/logic/volunteerSpreadsheet.py Outdated Show resolved Hide resolved

app/logic/volunteerSpreadsheet.py Outdated Show resolved Hide resolved

JohnCox2211 assigned Arohasina Feb 26, 2026

JohnCox2211 self-requested a review February 26, 2026 19:59

ojmakinde self-requested a review February 26, 2026 20:06

removed print statements

be0b9af

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot AI review requested due to automatic review settings February 26, 2026 20:27

removed commented code

eeb4674

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot started reviewing on behalf of Arohasina February 26, 2026 20:28 View session

Arohasina and others added 2 commits February 26, 2026 15:28

Update app/logic/volunteerSpreadsheet.py

07e2ded

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Update app/logic/volunteerSpreadsheet.py

ee86729

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot AI reviewed Feb 26, 2026

View reviewed changes

app/logic/volunteerSpreadsheet.py Outdated Show resolved Hide resolved

app/logic/volunteerSpreadsheet.py Outdated Show resolved Hide resolved

tests/code/test_spreadsheet.py Outdated Show resolved Hide resolved

JohnCox2211 and others added 3 commits February 26, 2026 15:31

Merge branch 'development' of https://github.com/BCStudentSoftwareDev…

c9119da

…Team/celts into Labor_Attendance_report_1626

removed redundant event and reused existing ones

6209cba

Merge branch 'Labor_Attendance_report_1626' of github.com:BCStudentSo…

d68bda6

…ftwareDevTeam/celts into Labor_Attendance_report_1626

Copilot AI review requested due to automatic review settings February 26, 2026 20:37

Copilot started reviewing on behalf of Arohasina February 26, 2026 20:37 View session

Copilot AI reviewed Feb 26, 2026

View reviewed changes

added distinct

4a863e3

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot AI review requested due to automatic review settings February 26, 2026 20:55

Copilot started reviewing on behalf of Arohasina February 26, 2026 20:56 View session

Copilot AI reviewed Feb 26, 2026

View reviewed changes

MImran2002 reviewed Mar 8, 2026

View reviewed changes

tests/code/test_spreadsheet.py Outdated Show resolved Hide resolved

Arohasina added 3 commits March 10, 2026 14:46

Merge remote-tracking branch 'origin' into Labor_Attendance_report_1626

7652303

include all labor students even with zero attendance and non-labor at…

d37e2ae

…tendees

added the return

7936d62

Update app/logic/volunteerSpreadsheet.py

68ca9ef

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot AI review requested due to automatic review settings March 29, 2026 02:40

Copilot started reviewing on behalf of Arohasina March 29, 2026 02:41 View session

Copilot AI reviewed Mar 29, 2026

View reviewed changes

tests/code/test_spreadsheet.py Show resolved Hide resolved

app/logic/volunteerSpreadsheet.py Outdated Show resolved Hide resolved

MImran2002 requested changes Mar 31, 2026

View reviewed changes

app/logic/volunteerSpreadsheet.py Outdated Show resolved Hide resolved

app/logic/volunteerSpreadsheet.py Outdated Show resolved Hide resolved

app/logic/volunteerSpreadsheet.py Outdated Show resolved Hide resolved

app/logic/volunteerSpreadsheet.py Show resolved Hide resolved

ojmakinde previously approved these changes Mar 31, 2026

View reviewed changes

Copilot AI review requested due to automatic review settings March 31, 2026 21:04

Arohasina dismissed ojmakinde’s stale review via 2367622 March 31, 2026 21:04

Copilot started reviewing on behalf of Arohasina March 31, 2026 21:05 View session

Copilot AI reviewed Mar 31, 2026

View reviewed changes

app/logic/volunteerSpreadsheet.py Outdated Show resolved Hide resolved

app/logic/volunteerSpreadsheet.py Show resolved Hide resolved

app/logic/volunteerSpreadsheet.py Show resolved Hide resolved

Copilot AI review requested due to automatic review settings March 31, 2026 21:09

Copilot started reviewing on behalf of Arohasina March 31, 2026 21:10 View session

Arohasina requested review from Copilot and removed request for Copilot March 31, 2026 21:10

Copilot started reviewing on behalf of Arohasina March 31, 2026 21:12 View session

Copilot AI reviewed Mar 31, 2026

View reviewed changes

app/logic/volunteerSpreadsheet.py Outdated Show resolved Hide resolved

app/logic/volunteerSpreadsheet.py Outdated Show resolved Hide resolved

tests/code/test_spreadsheet.py Show resolved Hide resolved

Arohasina force-pushed the Labor_Attendance_report_1626 branch from 596e485 to 68ca9ef Compare March 31, 2026 21:43

Update tests/code/test_spreadsheet.py

08b756e

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot AI review requested due to automatic review settings March 31, 2026 21:49

Copilot started reviewing on behalf of Arohasina March 31, 2026 21:49 View session

Copilot AI reviewed Mar 31, 2026

View reviewed changes

Arohasina added 2 commits March 31, 2026 18:33

fix spring report not including 0 attendance for labor students

8e06bec

updated test

3baaf0c

Copilot AI review requested due to automatic review settings March 31, 2026 22:35

Copilot started reviewing on behalf of Arohasina March 31, 2026 22:36 View session

Copilot AI reviewed Mar 31, 2026

View reviewed changes

app/logic/volunteerSpreadsheet.py Outdated Show resolved Hide resolved

app/logic/volunteerSpreadsheet.py Show resolved Hide resolved

app/logic/volunteerSpreadsheet.py Show resolved Hide resolved

add distinct

c305246

MImran2002 reviewed Apr 1, 2026

View reviewed changes

Conversation

Arohasina commented Feb 25, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Issue Description

Changes

Testing

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ojmakinde left a comment

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Arohasina commented Mar 31, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Mar 31, 2026

Uh oh!

MImran2002 left a comment

Arohasina commented Feb 25, 2026 •

edited

Loading